main: Assume / for ls if no path given

Since it just is kind of a sane default.

diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c
index 3e016902667231e2869d087e641f706711adf3d7..6d8423ebcfc3f2e50de1bae17a5734b7b801127f 100644 (file)
--- a/src/ostree/ot-builtin-ls.c
+++ b/src/ostree/ot-builtin-ls.c
@@ -198,6 +198,46 @@ print_directory_recurse (GFile    *f,
   return ret;
 }
 
+static gboolean
+print_one_argument (OstreeRepo   *repo,
+                    GFile        *root,
+                    const char   *arg,
+                    GCancellable *cancellable,
+                    GError      **error)
+{
+  gboolean ret = FALSE;
+  gs_unref_object GFile *f = NULL;
+  gs_unref_object GFileInfo *file_info = NULL;
+
+  f = g_file_resolve_relative_path (root, arg);
+  
+  file_info = g_file_query_info (f, OSTREE_GIO_FAST_QUERYINFO,
+                                 G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                                 cancellable, error);
+  if (!file_info)
+    goto out;
+  
+  print_one_file (f, file_info);
+      
+  if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
+    {
+      if (opt_recursive)
+        {
+          if (!print_directory_recurse (f, -1, error))
+            goto out;
+        }
+      else if (!opt_dironly)
+        {
+          if (!print_directory_recurse (f, 1, error))
+            goto out;
+        }
+    }
+  
+  ret = TRUE;
+ out:
+  return ret;
+}
+
 gboolean
 ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancellable, GError **error)
 {
@@ -220,9 +260,9 @@ ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancel
   if (!ostree_repo_check (repo, error))
     goto out;
 
-  if (argc <= 2)
+  if (argc <= 1)
     {
-      ot_util_usage_error (context, "An COMMIT and at least one PATH argument are required", error);
+      ot_util_usage_error (context, "An COMMIT argument is required", error);
       goto out;
     }
   rev = argv[1];
@@ -230,35 +270,20 @@ ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancel
   if (!ostree_repo_read_commit (repo, rev, &root, cancellable, error))
     goto out;
 
-  for (i = 2; i < argc; i++)
+  if (argc > 2)
     {
-      g_clear_object (&f);
-      f = g_file_resolve_relative_path (root, argv[i]);
-
-      g_clear_object (&file_info);
-      file_info = g_file_query_info (f, OSTREE_GIO_FAST_QUERYINFO,
-                                     G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                     cancellable, error);
-      if (!file_info)
-        goto out;
-      
-      print_one_file (f, file_info);
-
-      if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
+      for (i = 2; i < argc; i++)
         {
-          if (opt_recursive)
-            {
-              if (!print_directory_recurse (f, -1, error))
-                goto out;
-            }
-          else if (!opt_dironly)
-            {
-              if (!print_directory_recurse (f, 1, error))
-                goto out;
-            }
+          if (!print_one_argument (repo, root, argv[i], cancellable, error))
+            goto out;
         }
     }
- 
+  else
+    {
+      if (!print_one_argument (repo, root, "/", cancellable, error))
+        goto out;
+    }
+  
   ret = TRUE;
  out:
   if (context)

diff --git a/tests/test-basic.sh b/tests/test-basic.sh
index 998c6d9d6094effb03772570468c23e463a26b7a..c6401ad56f6c97aa14257a25c25704af52bc098b 100755 (executable)
--- a/tests/test-basic.sh
+++ b/tests/test-basic.sh
@@ -19,7 +19,7 @@
 
 set -e
 
-echo "1..34"
+echo "1..35"
 
 . $(dirname $0)/libtest.sh
 
@@ -241,3 +241,7 @@ $OSTREE checkout test2 test2-checkout
 (cd test2-checkout && $OSTREE commit --link-checkout-speedup -b test2 -s "tmp")
 echo "ok commit with link speedup"
 
+cd ${test_tmpdir}
+$OSTREE ls test2
+echo "ok ls with no argument"
+